diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4d60607..945375b 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4d60607..945375b 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index eff590e..91bb139 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -480,8 +480,7 @@ GSODataset dataset = Utility.dataSource.GetDatasetAt(j); - if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption) - && Utility.userRole.IndexOf(dataset.Caption.Substring(0,3))>=0) + if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption)) { dataset.Caption = dataset.Name; globeControl1.Globe.Layers.Add(dataset); @@ -618,24 +617,11 @@ double y = 0; double z = 0; - if (Utility.userRole.IndexOf("PL_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[2]); - } - else if (Utility.userRole.IndexOf("WL_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[2]); - } - else if (Utility.userRole.IndexOf("JS_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[2]); - } + + x = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[0]); + y = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[1]); + z = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[2]); + jumpToCameraState(x, y, z); } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4d60607..945375b 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index eff590e..91bb139 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -480,8 +480,7 @@ GSODataset dataset = Utility.dataSource.GetDatasetAt(j); - if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption) - && Utility.userRole.IndexOf(dataset.Caption.Substring(0,3))>=0) + if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption)) { dataset.Caption = dataset.Name; globeControl1.Globe.Layers.Add(dataset); @@ -618,24 +617,11 @@ double y = 0; double z = 0; - if (Utility.userRole.IndexOf("PL_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[2]); - } - else if (Utility.userRole.IndexOf("WL_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[2]); - } - else if (Utility.userRole.IndexOf("JS_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[2]); - } + + x = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[0]); + y = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[1]); + z = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[2]); + jumpToCameraState(x, y, z); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index aae1cb8..85e7cf5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4571,7 +4571,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(55138, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(55435, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4681,7 +4681,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(55137, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(55434, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5683,7 +5683,7 @@ this.dataGridViewX6.RowHeadersDefaultCellStyle = dataGridViewCellStyle30; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(62, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5783,7 +5783,7 @@ this.dataGridViewX7.RowHeadersDefaultCellStyle = dataGridViewCellStyle33; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(61, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4d60607..945375b 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index eff590e..91bb139 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -480,8 +480,7 @@ GSODataset dataset = Utility.dataSource.GetDatasetAt(j); - if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption) - && Utility.userRole.IndexOf(dataset.Caption.Substring(0,3))>=0) + if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption)) { dataset.Caption = dataset.Name; globeControl1.Globe.Layers.Add(dataset); @@ -618,24 +617,11 @@ double y = 0; double z = 0; - if (Utility.userRole.IndexOf("PL_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[2]); - } - else if (Utility.userRole.IndexOf("WL_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[2]); - } - else if (Utility.userRole.IndexOf("JS_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[2]); - } + + x = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[0]); + y = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[1]); + z = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[2]); + jumpToCameraState(x, y, z); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index aae1cb8..85e7cf5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4571,7 +4571,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(55138, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(55435, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4681,7 +4681,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(55137, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(55434, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5683,7 +5683,7 @@ this.dataGridViewX6.RowHeadersDefaultCellStyle = dataGridViewCellStyle30; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(62, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5783,7 +5783,7 @@ this.dataGridViewX7.RowHeadersDefaultCellStyle = dataGridViewCellStyle33; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(61, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 9b3eb53..4d9cc43 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -63,9 +63,7 @@ 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 - 114.144663, 25.799881,500 - 114.127163, 25.789981,500 -114.127163, 25.789981,500 + 114.144663, 25.799881,500 6000,6100 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4d60607..945375b 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index eff590e..91bb139 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -480,8 +480,7 @@ GSODataset dataset = Utility.dataSource.GetDatasetAt(j); - if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption) - && Utility.userRole.IndexOf(dataset.Caption.Substring(0,3))>=0) + if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption)) { dataset.Caption = dataset.Name; globeControl1.Globe.Layers.Add(dataset); @@ -618,24 +617,11 @@ double y = 0; double z = 0; - if (Utility.userRole.IndexOf("PL_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[2]); - } - else if (Utility.userRole.IndexOf("WL_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[2]); - } - else if (Utility.userRole.IndexOf("JS_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[2]); - } + + x = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[0]); + y = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[1]); + z = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[2]); + jumpToCameraState(x, y, z); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index aae1cb8..85e7cf5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4571,7 +4571,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(55138, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(55435, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4681,7 +4681,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(55137, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(55434, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5683,7 +5683,7 @@ this.dataGridViewX6.RowHeadersDefaultCellStyle = dataGridViewCellStyle30; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(62, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5783,7 +5783,7 @@ this.dataGridViewX7.RowHeadersDefaultCellStyle = dataGridViewCellStyle33; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(61, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 9b3eb53..4d9cc43 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -63,9 +63,7 @@ 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 - 114.144663, 25.799881,500 - 114.127163, 25.789981,500 -114.127163, 25.789981,500 + 114.144663, 25.799881,500 6000,6100 diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe index a877009..b7565df 100644 --- a/bin/x86/Debug/Cyberpipe.exe +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4d60607..945375b 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index eff590e..91bb139 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -480,8 +480,7 @@ GSODataset dataset = Utility.dataSource.GetDatasetAt(j); - if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption) - && Utility.userRole.IndexOf(dataset.Caption.Substring(0,3))>=0) + if (dataset != null && Utility.layerNameSet.Contains(dataset.Caption)) { dataset.Caption = dataset.Name; globeControl1.Globe.Layers.Add(dataset); @@ -618,24 +617,11 @@ double y = 0; double z = 0; - if (Utility.userRole.IndexOf("PL_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["PL_"].ToString().Split(',')[2]); - } - else if (Utility.userRole.IndexOf("WL_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["WL_"].ToString().Split(',')[2]); - } - else if (Utility.userRole.IndexOf("JS_") >= 0) - { - x = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[0]); - y = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[1]); - z = Convert.ToDouble(Utility.Query_Roads["JS_"].ToString().Split(',')[2]); - } + + x = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[0]); + y = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[1]); + z = Convert.ToDouble(Utility.Query_Roads["defaultLocation"].ToString().Split(',')[2]); + jumpToCameraState(x, y, z); } diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index aae1cb8..85e7cf5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -4571,7 +4571,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(55138, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(55435, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4681,7 +4681,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(55137, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(55434, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5683,7 +5683,7 @@ this.dataGridViewX6.RowHeadersDefaultCellStyle = dataGridViewCellStyle30; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(62, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5783,7 +5783,7 @@ this.dataGridViewX7.RowHeadersDefaultCellStyle = dataGridViewCellStyle33; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(61, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 9b3eb53..4d9cc43 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -63,9 +63,7 @@ 编号,地面高程,X坐标,Y坐标,管线点编码,井深,图片编码,类型,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 - 114.144663, 25.799881,500 - 114.127163, 25.789981,500 -114.127163, 25.789981,500 + 114.144663, 25.799881,500 6000,6100 diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe index a877009..b7565df 100644 --- a/bin/x86/Debug/Cyberpipe.exe +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/layerConfig.xml b/bin/x86/Debug/layerConfig.xml index 3c423ef..02963f5 100644 --- a/bin/x86/Debug/layerConfig.xml +++ b/bin/x86/Debug/layerConfig.xml @@ -11,49 +11,42 @@ - - - - + + - - - - + + - - - + + - - + + - - - - + + - + - +