diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4420f89..cfbffd5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4420f89..cfbffd5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 7d14b38..a989621 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -466,12 +466,13 @@ { try { - String lrcMap = Application.StartupPath + "\\lrc\\tianditu.lrc"; + /*String lrcMap = Application.StartupPath + "\\lrc\\tianditu.lrc"; String lrcBz = Application.StartupPath + "\\lrc\\biaozhu.lrc"; String lrcDl = Application.StartupPath + "\\lrc\\daolu.lrc"; globeControl1.Globe.Layers.Add(lrcMap); globeControl1.Globe.Layers.Add(lrcBz); globeControl1.Globe.Layers.Add(lrcDl); + */ globeControl1.Globe.Layers.MoveDown(10000); //加载实测管线数据 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4420f89..cfbffd5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 7d14b38..a989621 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -466,12 +466,13 @@ { try { - String lrcMap = Application.StartupPath + "\\lrc\\tianditu.lrc"; + /*String lrcMap = Application.StartupPath + "\\lrc\\tianditu.lrc"; String lrcBz = Application.StartupPath + "\\lrc\\biaozhu.lrc"; String lrcDl = Application.StartupPath + "\\lrc\\daolu.lrc"; globeControl1.Globe.Layers.Add(lrcMap); globeControl1.Globe.Layers.Add(lrcBz); globeControl1.Globe.Layers.Add(lrcDl); + */ globeControl1.Globe.Layers.MoveDown(10000); //加载实测管线数据 diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 2d5a6e0..26405c1 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(56326, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(56623, 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(56325, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(56622, 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(11, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(0, 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(10, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(0, 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 4420f89..cfbffd5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 7d14b38..a989621 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -466,12 +466,13 @@ { try { - String lrcMap = Application.StartupPath + "\\lrc\\tianditu.lrc"; + /*String lrcMap = Application.StartupPath + "\\lrc\\tianditu.lrc"; String lrcBz = Application.StartupPath + "\\lrc\\biaozhu.lrc"; String lrcDl = Application.StartupPath + "\\lrc\\daolu.lrc"; globeControl1.Globe.Layers.Add(lrcMap); globeControl1.Globe.Layers.Add(lrcBz); globeControl1.Globe.Layers.Add(lrcDl); + */ globeControl1.Globe.Layers.MoveDown(10000); //加载实测管线数据 diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 2d5a6e0..26405c1 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(56326, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(56623, 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(56325, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(56622, 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(11, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(0, 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(10, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(0, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index e34ba41..cbcf9a7 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.2.0.0")] +[assembly: AssemblyFileVersion("1.2.0.0")] diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 4420f89..cfbffd5 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index 7d14b38..a989621 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -466,12 +466,13 @@ { try { - String lrcMap = Application.StartupPath + "\\lrc\\tianditu.lrc"; + /*String lrcMap = Application.StartupPath + "\\lrc\\tianditu.lrc"; String lrcBz = Application.StartupPath + "\\lrc\\biaozhu.lrc"; String lrcDl = Application.StartupPath + "\\lrc\\daolu.lrc"; globeControl1.Globe.Layers.Add(lrcMap); globeControl1.Globe.Layers.Add(lrcBz); globeControl1.Globe.Layers.Add(lrcDl); + */ globeControl1.Globe.Layers.MoveDown(10000); //加载实测管线数据 diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 2d5a6e0..26405c1 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(56326, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(56623, 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(56325, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(56622, 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(11, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(0, 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(10, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(0, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index e34ba41..cbcf9a7 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.2.0.0")] +[assembly: AssemblyFileVersion("1.2.0.0")] diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe index 68899bb..9354e2c 100644 --- a/bin/x86/Debug/Cyberpipe.exe +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ