diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb new file mode 100644 index 0000000..2521d3a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb new file mode 100644 index 0000000..2521d3a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb new file mode 100644 index 0000000..549faf5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb new file mode 100644 index 0000000..2521d3a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb new file mode 100644 index 0000000..549faf5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb new file mode 100644 index 0000000..7fe1720 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb new file mode 100644 index 0000000..2521d3a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb new file mode 100644 index 0000000..549faf5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb new file mode 100644 index 0000000..7fe1720 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb new file mode 100644 index 0000000..492c19b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb new file mode 100644 index 0000000..2521d3a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb new file mode 100644 index 0000000..549faf5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb new file mode 100644 index 0000000..7fe1720 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb new file mode 100644 index 0000000..492c19b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb new file mode 100644 index 0000000..43deaab --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb new file mode 100644 index 0000000..2521d3a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb new file mode 100644 index 0000000..549faf5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb new file mode 100644 index 0000000..7fe1720 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb new file mode 100644 index 0000000..492c19b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb new file mode 100644 index 0000000..43deaab --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb new file mode 100644 index 0000000..8852c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb new file mode 100644 index 0000000..2521d3a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb new file mode 100644 index 0000000..549faf5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb new file mode 100644 index 0000000..7fe1720 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb new file mode 100644 index 0000000..492c19b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb new file mode 100644 index 0000000..43deaab --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb new file mode 100644 index 0000000..8852c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb new file mode 100644 index 0000000..99442c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb new file mode 100644 index 0000000..2521d3a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb new file mode 100644 index 0000000..549faf5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb new file mode 100644 index 0000000..7fe1720 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb new file mode 100644 index 0000000..492c19b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb new file mode 100644 index 0000000..43deaab --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb new file mode 100644 index 0000000..8852c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb new file mode 100644 index 0000000..99442c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb Binary files differ diff --git a/bin/x86/Debug/databaseConfig.xml b/bin/x86/Debug/databaseConfig.xml index 41d6212..9b6753d 100644 --- a/bin/x86/Debug/databaseConfig.xml +++ b/bin/x86/Debug/databaseConfig.xml @@ -3,6 +3,6 @@ True 192.168.0.203 SZHTDB2 - scott - SZHTDB2 + release + release \ No newline at end of file diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb new file mode 100644 index 0000000..2521d3a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb new file mode 100644 index 0000000..549faf5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb new file mode 100644 index 0000000..7fe1720 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb new file mode 100644 index 0000000..492c19b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb new file mode 100644 index 0000000..43deaab --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb new file mode 100644 index 0000000..8852c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb new file mode 100644 index 0000000..99442c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb Binary files differ diff --git a/bin/x86/Debug/databaseConfig.xml b/bin/x86/Debug/databaseConfig.xml index 41d6212..9b6753d 100644 --- a/bin/x86/Debug/databaseConfig.xml +++ b/bin/x86/Debug/databaseConfig.xml @@ -3,6 +3,6 @@ True 192.168.0.203 SZHTDB2 - scott - SZHTDB2 + release + release \ No newline at end of file diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 8717480..fe43c1a 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb new file mode 100644 index 0000000..2521d3a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb new file mode 100644 index 0000000..549faf5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb new file mode 100644 index 0000000..7fe1720 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb new file mode 100644 index 0000000..492c19b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb new file mode 100644 index 0000000..43deaab --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb new file mode 100644 index 0000000..8852c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb new file mode 100644 index 0000000..99442c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb Binary files differ diff --git a/bin/x86/Debug/databaseConfig.xml b/bin/x86/Debug/databaseConfig.xml index 41d6212..9b6753d 100644 --- a/bin/x86/Debug/databaseConfig.xml +++ b/bin/x86/Debug/databaseConfig.xml @@ -3,6 +3,6 @@ True 192.168.0.203 SZHTDB2 - scott - SZHTDB2 + release + release \ No newline at end of file diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 8717480..fe43c1a 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb new file mode 100644 index 0000000..2521d3a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb new file mode 100644 index 0000000..549faf5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb new file mode 100644 index 0000000..7fe1720 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb new file mode 100644 index 0000000..492c19b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb new file mode 100644 index 0000000..43deaab --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb new file mode 100644 index 0000000..8852c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb new file mode 100644 index 0000000..99442c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb Binary files differ diff --git a/bin/x86/Debug/databaseConfig.xml b/bin/x86/Debug/databaseConfig.xml index 41d6212..9b6753d 100644 --- a/bin/x86/Debug/databaseConfig.xml +++ b/bin/x86/Debug/databaseConfig.xml @@ -3,6 +3,6 @@ True 192.168.0.203 SZHTDB2 - scott - SZHTDB2 + release + release \ No newline at end of file diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 8717480..fe43c1a 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index fd267cc..f1f3e75 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index 3f178cb..e052ab5 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -49,7 +49,8 @@ try { this.dateTimePicker_end.Value = DateTime.Now; - + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); + LoadData(); conn = OledbHelper.sqlConnection(); diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index 8bd9e48..95013ac 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -52,6 +52,7 @@ try { this.dateTimePicker_end.Value = DateTime.Now; + this.dateTimePicker_start.Value = DateTime.Now.AddDays(-6); LoadData(); diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 69c4e7e..5083f44 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -279,7 +279,7 @@ sqlData += " and writer='" + comboWriter + "'"; sqlCount += " and writer='" + comboWriter + "'"; } - sqlData += " order by DBID desc)b " + + sqlData += " order by upday desc)b " + "where(b.row_num between " + minPage + " and " + maxPage + ")"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -444,6 +444,13 @@ try { string filename = row.Cells["文档名称"].Value.ToString(); + this.Invoke((EventHandler)delegate + { + wordDocumentControl.Visible = false; + excelDocumentControl.Visible = false; + pdfDocumentControl.Visible = false; + pictureDocumentControl.Visible = false; + }); lock (lockHelp) { string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; diff --git a/FrmAddFlagBatch.cs b/FrmAddFlagBatch.cs index 958e0b2..4a959c1 100644 --- a/FrmAddFlagBatch.cs +++ b/FrmAddFlagBatch.cs @@ -92,7 +92,7 @@ private void btn_imp_Click(object sender, EventArgs e) { try - { + { if (String.IsNullOrEmpty(txt_layer_file.Text.Trim())) { MessageBox.Show("请选择一个图层文件！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning); @@ -136,7 +136,7 @@ { featdataset = CreateDBFeatureDataset(txt_layer_name.Text.Trim()); } - + this.Cursor = Cursors.WaitCursor; featdataset.Open(); GSOLayer shpLayer = globeControl1.Globe.Layers.GetLayerByCaption(selectLayerName); @@ -145,7 +145,25 @@ if (dataset != null) { //根据编号删除数据库图层中已经存在的记录即要素 - string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 in ("; + //for (int j = 0; j < features.Length; j++) + //{ + // GSOFeature f = features[j]; + // if (f != null && f.IsFieldValueNull("编号") == false) + // { + // string fieldID = f.GetFieldAsString("编号").Trim(); + // if (!String.IsNullOrEmpty(fieldID)) + // { + // sql += "'" + fieldID + "',"; + // } + // } + //} + //sql = sql.Substring(0, sql.Length - 1); + //sql += ")"; + //OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + + //根据编号删除数据库图层中已经存在的记录即要素 + for (int j = 0; j < features.Length; j++) { GSOFeature f = features[j]; @@ -154,13 +172,11 @@ string fieldID = f.GetFieldAsString("编号").Trim(); if (!String.IsNullOrEmpty(fieldID)) { - sql += "'" + fieldID + "',"; + string sql = "delete from " + txt_layer_name.Text.Trim() + " where 编号 ="+"'" + fieldID + "'"; + OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); } } - } - sql = sql.Substring(0, sql.Length - 1); - sql += ")"; - OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); + } } featdataset.Close(); @@ -207,6 +223,7 @@ featdataset.AddFeature(feature); } featdataset.Save(); + this.Cursor = Cursors.Default; MessageBox.Show("入库成功！", "提示"); if (shpLayer == null) { @@ -219,6 +236,7 @@ } catch (Exception ex) { + this.Cursor = Cursors.Default; MessageBox.Show("批量导入失败：" + ex.ToString(), "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/FrmAddSinMark.cs b/FrmAddSinMark.cs index 9db08ba..ee33a13 100644 --- a/FrmAddSinMark.cs +++ b/FrmAddSinMark.cs @@ -373,17 +373,17 @@ list.Add(nextFile.Name); } } - comboBox1.DropDownStyle = ComboBoxStyle.DropDown; + comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; comboBox1.Items.Add("BIRMM-EM14"); comboBox1.Items.Add("BIRMM-EM30"); comboBox1.Text = "BIRMM-EM14"; - comboBox3.DropDownStyle = ComboBoxStyle.DropDown; + comboBox3.DropDownStyle = ComboBoxStyle.DropDownList; comboBox3.Items.Add("使用中"); comboBox3.Items.Add("废弃"); comboBox3.Text = "使用中"; - comboBox2.DropDownStyle = ComboBoxStyle.DropDown; + comboBox2.DropDownStyle = ComboBoxStyle.DropDownList; for (int i = 0; i < Utility1.roadNmae.Count; i++) { comboBox2.Items.Add(Utility1.roadNmae[i]); diff --git a/FrmAddSinMark.designer.cs b/FrmAddSinMark.designer.cs index 3902629..d594fab 100644 --- a/FrmAddSinMark.designer.cs +++ b/FrmAddSinMark.designer.cs @@ -458,12 +458,13 @@ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom; this.dateTimePicker1.Location = new System.Drawing.Point(94, 185); this.dateTimePicker1.Name = "dateTimePicker1"; - this.dateTimePicker1.Size = new System.Drawing.Size(200, 21); + this.dateTimePicker1.Size = new System.Drawing.Size(186, 21); this.dateTimePicker1.TabIndex = 23; this.dateTimePicker1.Value = new System.DateTime(2014, 4, 4, 8, 25, 0, 0); // // comboBox2 // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(93, 215); this.comboBox2.Name = "comboBox2"; @@ -472,6 +473,7 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; this.comboBox1.Location = new System.Drawing.Point(94, 79); this.comboBox1.Name = "comboBox1"; @@ -480,6 +482,7 @@ // // comboBox3 // + this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; this.comboBox3.Location = new System.Drawing.Point(95, 241); this.comboBox3.Name = "comboBox3"; diff --git a/MainFrm.cs b/MainFrm.cs index ddf2a51..9ab0f58 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -3642,7 +3642,7 @@ nodelayerchild.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild.Checked = true; + nodelayerchild.Checked = false; setLayerVisible(layerName1); } @@ -3703,7 +3703,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } @@ -3745,7 +3745,7 @@ nodelayerchild1.Checked = boollayer; if (layerchildName.Contains("特征管点")) { - nodelayerchild1.Checked = true; + nodelayerchild1.Checked = false; setLayerVisible(layerName1); } nodelayerchild.Nodes.Add(nodelayerchild1); diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 0b1d901..4489ae5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -372,6 +372,11 @@ this.btn_Person = new DevComponents.DotNetBar.ButtonItem(); this.btn_constructMap = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemGHSC = new DevComponents.DotNetBar.ButtonItem(); @@ -387,11 +392,6 @@ this.ribbonBar5 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); this.slider4ground = new DevComponents.DotNetBar.SliderItem(); - this.ribbonPanel2 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem_TaskManager = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_OnlineTask = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem_Event = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel8 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar_UserInfo = new DevComponents.DotNetBar.RibbonBar(); this.btn_user_info = new DevComponents.DotNetBar.ButtonItem(); @@ -691,9 +691,9 @@ this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); - this.ribbonPanel2.SuspendLayout(); this.ribbonPanel8.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); @@ -4172,9 +4172,9 @@ this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel4); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel8); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel12); @@ -4327,6 +4327,97 @@ this.buttonItem9.Text = "文档管理"; this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); // + // ribbonPanel2 + // + this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel2.Controls.Add(this.ribbonBar4); + this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel2.Name = "ribbonPanel2"; + this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); + // + // + // + this.ribbonPanel2.Style.Class = ""; + this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseDown.Class = ""; + this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel2.StyleMouseOver.Class = ""; + this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel2.TabIndex = 39; + this.ribbonPanel2.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem_TaskManager, + this.buttonItem_OnlineTask, + this.buttonItem_Event}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(211, 92); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + this.ribbonBar4.Text = "ribbonBar4"; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // buttonItem_TaskManager + // + this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; + this.buttonItem_TaskManager.SubItemsExpandWidth = 14; + this.buttonItem_TaskManager.Text = "工单管理"; + this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); + // + // buttonItem_OnlineTask + // + this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; + this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; + this.buttonItem_OnlineTask.Text = "在线任务"; + this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); + // + // buttonItem_Event + // + this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem_Event.Name = "buttonItem_Event"; + this.buttonItem_Event.SubItemsExpandWidth = 14; + this.buttonItem_Event.Text = "事件管理"; + this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); + // // ribbonPanel4 // this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4557,97 +4648,6 @@ this.slider4ground.Value = 0; this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); // - // ribbonPanel2 - // - this.ribbonPanel2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel2.Controls.Add(this.ribbonBar4); - this.ribbonPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel2.Location = new System.Drawing.Point(0, 0); - this.ribbonPanel2.Name = "ribbonPanel2"; - this.ribbonPanel2.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel2.Size = new System.Drawing.Size(1328, 95); - // - // - // - this.ribbonPanel2.Style.Class = ""; - this.ribbonPanel2.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseDown.Class = ""; - this.ribbonPanel2.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel2.StyleMouseOver.Class = ""; - this.ribbonPanel2.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel2.TabIndex = 39; - this.ribbonPanel2.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem_TaskManager, - this.buttonItem_OnlineTask, - this.buttonItem_Event}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(211, 92); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - this.ribbonBar4.Text = "ribbonBar4"; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // buttonItem_TaskManager - // - this.buttonItem_TaskManager.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem_TaskManager.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_TaskManager.Name = "buttonItem_TaskManager"; - this.buttonItem_TaskManager.SubItemsExpandWidth = 14; - this.buttonItem_TaskManager.Text = "工单管理"; - this.buttonItem_TaskManager.Click += new System.EventHandler(this.buttonItem_TaskManager_Click); - // - // buttonItem_OnlineTask - // - this.buttonItem_OnlineTask.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem_OnlineTask.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_OnlineTask.Name = "buttonItem_OnlineTask"; - this.buttonItem_OnlineTask.SubItemsExpandWidth = 14; - this.buttonItem_OnlineTask.Text = "在线任务"; - this.buttonItem_OnlineTask.Click += new System.EventHandler(this.buttonItem_OnlineTask_Click); - // - // buttonItem_Event - // - this.buttonItem_Event.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem_Event.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem_Event.Name = "buttonItem_Event"; - this.buttonItem_Event.SubItemsExpandWidth = 14; - this.buttonItem_Event.Text = "事件管理"; - this.buttonItem_Event.Click += new System.EventHandler(this.buttonItem_Event_Click); - // // ribbonPanel8 // this.ribbonPanel8.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -7182,9 +7182,9 @@ this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); - this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel8.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config index 8ba3d20..e699d89 100644 --- a/bin/x86/Debug/EMSCyberpipe.vshost.exe.config +++ b/bin/x86/Debug/EMSCyberpipe.vshost.exe.config @@ -8,8 +8,8 @@ - - + + diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb new file mode 100644 index 0000000..7932c53 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/104B77E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb new file mode 100644 index 0000000..bfa9e24 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/10AD32F7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb new file mode 100644 index 0000000..beaca74 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/11617F73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb new file mode 100644 index 0000000..4dba9c5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1209B91C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb new file mode 100644 index 0000000..0f58ce0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/12B14559.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb new file mode 100644 index 0000000..b915529 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/15F38AD7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb new file mode 100644 index 0000000..b86dc8b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1AF92877.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb new file mode 100644 index 0000000..e5b63a4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1C143E24.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb new file mode 100644 index 0000000..ee3f452 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/1E40F329.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb new file mode 100644 index 0000000..5d258b1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/21831F0B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb new file mode 100644 index 0000000..56cb1cd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/29945B99.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb new file mode 100644 index 0000000..a43edd9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2B8D30E5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb new file mode 100644 index 0000000..86995a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2C4C022D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb new file mode 100644 index 0000000..5551b35 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2D743AC8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb new file mode 100644 index 0000000..13dc52a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2EB72869.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb new file mode 100644 index 0000000..557b43c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2F50CDF0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb new file mode 100644 index 0000000..203f47a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/2FB944E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb new file mode 100644 index 0000000..9a617a6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3054FD8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb new file mode 100644 index 0000000..9b5c516 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30C297CA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb new file mode 100644 index 0000000..3827ddc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/30E78013.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb new file mode 100644 index 0000000..e85a0c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3104EAB3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb new file mode 100644 index 0000000..b5752c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/31A72F39.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb new file mode 100644 index 0000000..b645d9e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3546FE16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb new file mode 100644 index 0000000..79f6828 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3582F7DE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb new file mode 100644 index 0000000..62ec9eb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3698C16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb new file mode 100644 index 0000000..5a732d6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3857D5C6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb new file mode 100644 index 0000000..31f7278 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3873BE3B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb new file mode 100644 index 0000000..3cbd191 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/38D075D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb new file mode 100644 index 0000000..7b81337 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3913E4AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb new file mode 100644 index 0000000..a780ffc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3A559520.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb new file mode 100644 index 0000000..0c83e77 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3AFB3EF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb new file mode 100644 index 0000000..84ea042 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3B4A77AE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb new file mode 100644 index 0000000..2ab912e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3D4EB3DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb new file mode 100644 index 0000000..1af4ef4 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3DF44D59.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb new file mode 100644 index 0000000..671e7f1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F551B09.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb new file mode 100644 index 0000000..11fbfbd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/3F7D9275.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb new file mode 100644 index 0000000..d1f1725 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/41F3F84B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb new file mode 100644 index 0000000..3cdcd70 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/43AFFBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb new file mode 100644 index 0000000..d9fdeb2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/446E9F21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb new file mode 100644 index 0000000..e4342f9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/47148C1C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb new file mode 100644 index 0000000..949a314 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4716D912.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb new file mode 100644 index 0000000..5a576ec --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/480EEDB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb new file mode 100644 index 0000000..8b52c34 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/48B6F804.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb new file mode 100644 index 0000000..2695b25 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4AE5ADDB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb new file mode 100644 index 0000000..18d353e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4B4365A6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb new file mode 100644 index 0000000..0dff88c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C2169DC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb new file mode 100644 index 0000000..fba0d37 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C31B573.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb new file mode 100644 index 0000000..5d11996 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4C41C822.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb new file mode 100644 index 0000000..3286704 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/4EC1F058.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb new file mode 100644 index 0000000..ada3fcf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/508B4C26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb new file mode 100644 index 0000000..03263b2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/543985FC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb new file mode 100644 index 0000000..6d3a9cb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/57AC7D60.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb new file mode 100644 index 0000000..9488d58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5935DA21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb new file mode 100644 index 0000000..6c74488 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5A7BC56C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb new file mode 100644 index 0000000..8d1c588 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5AC98121.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb new file mode 100644 index 0000000..28e98ea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5B1372C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb new file mode 100644 index 0000000..b8307de --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5D32A80.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb new file mode 100644 index 0000000..5f005a7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/5EAE9641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb new file mode 100644 index 0000000..fdf77dd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63829C23.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb new file mode 100644 index 0000000..ea7c256 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/63D81764.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb new file mode 100644 index 0000000..6662f6c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66945498.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb new file mode 100644 index 0000000..627135f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/66AEEBC1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb new file mode 100644 index 0000000..3a4072c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/67F89A55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb new file mode 100644 index 0000000..eacb662 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6817D92E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb new file mode 100644 index 0000000..31bf539 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/68594AAA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb new file mode 100644 index 0000000..c34e792 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6900923B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb new file mode 100644 index 0000000..30603a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6BFF0270.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb new file mode 100644 index 0000000..0fe6cba --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6C618160.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb new file mode 100644 index 0000000..f7a522c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/6D1F14D1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb new file mode 100644 index 0000000..67f1b03 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7125901D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb new file mode 100644 index 0000000..4f4697c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/714F93AC.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb new file mode 100644 index 0000000..1a10318 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/731998BE.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb new file mode 100644 index 0000000..c58d077 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7554A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb new file mode 100644 index 0000000..d8443da --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7732AAA9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb new file mode 100644 index 0000000..a554e98 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/77C7658A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb new file mode 100644 index 0000000..8ed9aff --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7AC8F15C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb new file mode 100644 index 0000000..cc2fcc9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7D28D293.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb new file mode 100644 index 0000000..a378973 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/7F870A7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb new file mode 100644 index 0000000..81734b9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/806991FA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb new file mode 100644 index 0000000..d6d0028 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8125DCE1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb new file mode 100644 index 0000000..d9196b0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8330A1D3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb new file mode 100644 index 0000000..91a6fdf --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/85D9ED66.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb new file mode 100644 index 0000000..47c3082 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/87CF67B7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb new file mode 100644 index 0000000..957621a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8B6025DF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb new file mode 100644 index 0000000..8d71517 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8C67D31F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb new file mode 100644 index 0000000..106c198 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/8D986C55.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb new file mode 100644 index 0000000..b266c1b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/907B5AB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb new file mode 100644 index 0000000..291324c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/90C660DD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb new file mode 100644 index 0000000..8652192 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/919AFB25.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb new file mode 100644 index 0000000..88020fb --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/91C97DF9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb new file mode 100644 index 0000000..48b73a9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/92ACA16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb new file mode 100644 index 0000000..1f2429a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/949EF9E9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb new file mode 100644 index 0000000..1e56367 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/95234FF6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb new file mode 100644 index 0000000..0fa60ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9535A69B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb new file mode 100644 index 0000000..9a8c8a0 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9640CC5D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb new file mode 100644 index 0000000..4b87bf3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/975A9FB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb new file mode 100644 index 0000000..1e34543 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/983CD9F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb new file mode 100644 index 0000000..9670c9f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/99C6745E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb new file mode 100644 index 0000000..e22604c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9C0521A1.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb new file mode 100644 index 0000000..9d0e398 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9CEE5578.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb new file mode 100644 index 0000000..668537e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9D45124F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb new file mode 100644 index 0000000..b5913ca --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9DA4F515.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb new file mode 100644 index 0000000..2d82b15 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9E216E34.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb new file mode 100644 index 0000000..782639e --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/9EF5A88F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb new file mode 100644 index 0000000..c25a01f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A239890A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb new file mode 100644 index 0000000..02aa011 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A270A659.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb new file mode 100644 index 0000000..8c86e32 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A5D28EB2.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb new file mode 100644 index 0000000..2473ce3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/A8B00547.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb new file mode 100644 index 0000000..c8fedf6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AC0DAB5B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb new file mode 100644 index 0000000..f824574 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AE7A84E7.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb new file mode 100644 index 0000000..e2ef4bd --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF01540E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb new file mode 100644 index 0000000..783704d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF425C7F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb new file mode 100644 index 0000000..ce85ae5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF659BBA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb new file mode 100644 index 0000000..01c0bea --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/AF975F5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb new file mode 100644 index 0000000..9b5fbc5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B09356B3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb new file mode 100644 index 0000000..351261d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4CD3BF5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb new file mode 100644 index 0000000..e7bad43 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B4DD3A71.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb new file mode 100644 index 0000000..22a8265 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7BBC897.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb new file mode 100644 index 0000000..7cf6ff2 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B7E0E6A4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb new file mode 100644 index 0000000..2026c23 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B8186C9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb new file mode 100644 index 0000000..3137f7f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9C0855C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb new file mode 100644 index 0000000..3aa81df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/B9F95FCD.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb new file mode 100644 index 0000000..e09bd11 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BB5FAC26.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb new file mode 100644 index 0000000..1b5720d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE409D57.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb new file mode 100644 index 0000000..572d4e6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/BE63CAF.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb new file mode 100644 index 0000000..af2c1c1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C391616B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb new file mode 100644 index 0000000..828e652 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/C598EC10.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb new file mode 100644 index 0000000..285c837 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB47DF21.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb new file mode 100644 index 0000000..cfee814 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CB911D8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb new file mode 100644 index 0000000..5362c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CBC624F9.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb new file mode 100644 index 0000000..b58acb1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CE3E051C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb new file mode 100644 index 0000000..f2eab45 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFB6E407.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb new file mode 100644 index 0000000..50ada58 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/CFC60EEA.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb new file mode 100644 index 0000000..7b805a5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D077F09D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb new file mode 100644 index 0000000..2c862ac --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C0E7E6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb new file mode 100644 index 0000000..f84ae73 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0C33EB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb new file mode 100644 index 0000000..f3129df --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D0FFD2E4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb new file mode 100644 index 0000000..f19ba62 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1283E3E.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb new file mode 100644 index 0000000..af0990a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D1F6C60B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb new file mode 100644 index 0000000..589e5ce --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D2C1C357.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb new file mode 100644 index 0000000..df1f388 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D430C63A.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb new file mode 100644 index 0000000..bbff499 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D4432041.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb new file mode 100644 index 0000000..35fa9b7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D54A038D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb new file mode 100644 index 0000000..a0745c3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D6499137.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb new file mode 100644 index 0000000..f900b50 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D699F665.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb new file mode 100644 index 0000000..eb0376b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D7F8095B.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb new file mode 100644 index 0000000..b63eac8 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D892A641.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb new file mode 100644 index 0000000..7e146b5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/D92B390F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb new file mode 100644 index 0000000..4a78bfe --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DAAA1A64.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb new file mode 100644 index 0000000..f592277 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DC9E182C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb new file mode 100644 index 0000000..508e573 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/DEF4B35D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb new file mode 100644 index 0000000..3ced403 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E038B881.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb new file mode 100644 index 0000000..8200e42 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E0746974.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb new file mode 100644 index 0000000..146de31 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E55EE950.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb new file mode 100644 index 0000000..4f4f09f --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E573DA11.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb new file mode 100644 index 0000000..2ad9184 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E5CF2F76.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb new file mode 100644 index 0000000..d6d2532 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E688BBC6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb new file mode 100644 index 0000000..adb9ce1 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E70D8F16.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb new file mode 100644 index 0000000..fd4c959 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E8489B35.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb new file mode 100644 index 0000000..49d76d9 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E881A53C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb new file mode 100644 index 0000000..7e611c7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/E99ECFB6.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb new file mode 100644 index 0000000..5debe3d --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB56C9D4.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb new file mode 100644 index 0000000..1f13ab3 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EB74693F.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb new file mode 100644 index 0000000..1b0e2fc --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EC25B9A0.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb new file mode 100644 index 0000000..8c85ba7 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EEF9280C.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb new file mode 100644 index 0000000..9c93c1c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF56C34D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb new file mode 100644 index 0000000..7d7b320 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/EF6B2922.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb new file mode 100644 index 0000000..15d68ef --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F1C05FC3.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb new file mode 100644 index 0000000..4b18478 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F2A73B73.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb new file mode 100644 index 0000000..2521d3a --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5036391.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb new file mode 100644 index 0000000..549faf5 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F5C8EAB5.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb new file mode 100644 index 0000000..7fe1720 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F6B94FF8.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb new file mode 100644 index 0000000..492c19b --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/F9F7A79D.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb new file mode 100644 index 0000000..43deaab --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FAF247AB.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb new file mode 100644 index 0000000..8852c5c --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FBF0F178.lcb Binary files differ diff --git a/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb b/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb new file mode 100644 index 0000000..99442c6 --- /dev/null +++ b/bin/x86/Debug/GeoScene/Globe/Temp/FEB255C5.lcb Binary files differ diff --git a/bin/x86/Debug/databaseConfig.xml b/bin/x86/Debug/databaseConfig.xml index 41d6212..9b6753d 100644 --- a/bin/x86/Debug/databaseConfig.xml +++ b/bin/x86/Debug/databaseConfig.xml @@ -3,6 +3,6 @@ True 192.168.0.203 SZHTDB2 - scott - SZHTDB2 + release + release \ No newline at end of file diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 8717480..fe43c1a 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index 4b2f8e6..1f28542 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index c962480..00ac7e7 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/GenerateResource.read.1.tlog b/obj/x86/Debug/GenerateResource.read.1.tlog index 08618ec..63f6f0b 100644 --- a/obj/x86/Debug/GenerateResource.read.1.tlog +++ b/obj/x86/Debug/GenerateResource.read.1.tlog Binary files differ